fix(cli): use HasPrefix for haproxy flag matching to avoid advertise-http-addr collision - #173090
Open
waterWang wants to merge 2 commits into
Open
Conversation
|
Thank you for contributing to CockroachDB. Please ensure you have followed the guidelines for creating a PR. Before a member of our team reviews your PR, I have some potential action items for you:
I was unable to automatically find a reviewer. You can try CCing one of the following members:
🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
blathers-crl
Bot
added
O-community
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fixes #172968
Problem:
nodeStatusesToNodeInfos()inpkg/cli/haproxy.gousesstrings.Containsto matchhttp-addrandhttp-portflags in node startup arguments. This substring match incorrectly matches--advertise-http-addras--http-addr, because "http-addr" is a substring of "advertise-http-addr".When a node is started with
--advertise-http-addrbefore--http-addr:--advertise-http-addrfs.Parse()is called but the--advertise-http-addrflag isn't registered in the local flag set_ =)--http-addris never reachedFix: Replace
strings.Containswithstrings.HasPrefixfor exact flag name matching. This ensures--advertise-http-addris not matched as--http-addr.Testing: Added a test case that reproduces the exact scenario:
--advertise-http-addr=node.example:9999followed by--http-addr=node.example:5678. The test verifies the correct port (5678) is used in the generated config.